Fixing #642