Fix update from Kelvin Lee