Fix : first try to fix hard coded paths