Fixed issue with defaults