Improve fix for #121