Added handling for imperfect last payloads