Fix mutators before validators bug