Fix for issue #82.