Better resolution of full path