Fixed a bug with firlname containing the whole path