Fix for Bug #533