Fixed mapping of default to defaultValue.