Fixed to save defaults