Merge "Fix for Bug 241."