Possible Registration Fix