Added fix for registration