fixed registration issues