Fix to handle a default value