Make sure mutable models are correctly ordered