Fixed the handling of default values