Fix for directives event handling mechanism