BugFix: corrected some routing options