Fixed saving and loading bug