Added fix use defaults