improve path fixing.