Made split filenames more idiot-proof