BUG 2392 - learning switch listener registration fix