Possible fix for registration bug.