Bug fix in class router