FIX duplication of filepath

Sometime the filepath is following with a space. In these case, there
are 2 entries in the filepath list.