Fixing single file mode