fix paths better