Temporary workaround for save error