Save File - Bug fix