Fixing #579