Fix for Bug 894229