fixed the registration for both devices