Fix from Thomas Castelle.