Fix for Bug 503