Fix a bug intro'd in 0c03abaa