Fixed setting of default values