Fix for issue #614.