Fix for issue #99.