fixed registration checks