ETD routing and bug fix