Better handling for fragmented messages