Another bug in 8beb0426190