3.18 discovered bug due to gen_listener changes