Fix to make second argument optional