(to be clear, it's an additional change to this problem, but probably should be handled)