Fixed RouterFactory