Fixing #641