Yet another update against the previous change