Incorrect death message with offhand bow and named item

Holding a bow in offhand slot and any renamed item in main hand. Killing with the bow results in the death message of:
"(player killed) was shot by (killer) using (renamed item in main hand)"
instead of "(player killed) was shot by (killer) using (name of bow)"

additionally having nothing in the main hand while having a bow in the off hand simply shows "(player killed) was shot by (killer)"