Bugfix/directives