fix for Bug 1046300