Fix property order