Merge "Fix for Bug 3"