Fixing #643