Added fix for default values not being override-able.