Bug fix with routing