Possible fix for issue #138.