Defaults now setting properly