Fix merge commit from 4bc21d2