Fixed issue with defaults handling code.