Fix save hierarchy