Well I implemented revised logic to get the first body (much like yours), I believe that one or two people reported something similar in the past but were never able to give me a good reproduction.
So thanks for the contribution.
Its ported from 4.22 back to 4.21 currently.