Hopefully fixed the "Save Failed" bug