Save Bug fixed