Fix to #25.