Fix issue where the bytes/messages are forwarded to the wrong handler