Fix behaviour with multiple payloads per flight. Thanks Upu.