better handle default values