Fixed another problem with saving