Save Function Hotfix