corrected handling of non-default values