Fixing #601