Hotfix to fix saving