Update from fix #152.