changed the way the file name full path is computed (search for file instead of building path)