Try and fix issue #122