Fixed issue with space on filename