Attempting to fix multiple-messages-in-single-frame issue