Better fix for issue #116