Update to incorporate comment of houshuang.