Fix bug in 2135f144