Added filename wrapping workaround