Registration Bug Fix