Fixed Registration hack