fixed issue of responding to all messages