Attempted to fix new saving bug