Improve path order issue