Bug fix introduced in 915577f45