Fix for default values overriding matched ones.