Fix for Bug #1409