Fixed when routing. Closes #4371