Fix from 0.9.8-stable.