Merge "Fix for Bug 144"