added proper basename instead of full path