Fix pattern match (again!)