Fixed issue on router classes