add additional edge cases to defaults