fixing CubeSaver