Fix the pattern some more