Fixed a bug with registration on TwD