Fix the Fields getByModel method, make sure new/current fields are in the correct order