Fix InitialFieldsMixin