ok I'll spend a bit more time crafting a patch