Fix for issue #110.