Fixed save and new bug