Fix PR#458