FIX: adding back directives