Quick fix for save