#26 Quick and dirty fix for preserving filenames

Proper solution still required!