Fixed: crashes when filename contained +