Further fix for fragmented messages