Fixed save system according to d53482b842db32c8617682114b18c2bbad324c30.