Fixed handler precedence issue