Fixing JIRA 594, truncation of fileName issue