fix problem when having different filename
fix whitespace
Merge pull request #2074 from yakky/feature/fix_1550

fix problem when having different filename