Fixed all registered device issue