Fix filename construction...doesn't fix the problem though