fix? for registration messages