Device Registration fix