Fixed bugs saving game