* fixed device token bug --- critical