Correct pattern matcher
Drop branch support temporarily