Fix for listing devices