Fix for issue #121.