Adjust pattern match for consistency