fix save ordering issue