Filename problems fixed