Fixed device token issue
Fixed device token issue