Fixed loading of directives