Fix for issue #116.