Fixing null directive case