I've thought about this problem a bit since we have a related issue internally