Death message shows player's held item instead of the bow if entity is killed with a TNT ignited by a fire arrow

Death message shows wrong item name if Player kills an entity that shows death message upon death(e.g. another player or tamed wolf) by igniting a TNT with fire arrow, and quickly switches held item to any named item before TNT blows up.

What I expected to happen was...:
Death message should say that the player killed the entity with the bow that ignited the TNT.

What actually happened was...:
Death message says that the player's currently held item was a source of death.

Steps to Reproduce:
1. Place a bow with Flame enchantment, and any named item into hotbar.
2. Place TNT beside an entity that shows death message upon death.
3. Ignite TNT with bow.
4. Quickly switch held item to the named item before TNT blows up.