Workaround SchemaShell issue for variable dir name