Fix for issue 628

cc #628