Fixing filename issue