Bug fix for more than 1 device of same type