Improve fix for issue #103