Fist attempt to fix issue #116