Fix for issue #151.