Fix save problem