Found better way to resolve filenames