Fixing #574