Fix mutators not being taken into account