Fix handlers invalidation