Fixed Registration Bug