Good point. See f0eb36b