thought I'd reverted the handler back to the way it was in master more or less, but the bug is still here, and not in master.