Bugfix: use the ritgh factory.