Try and fix issue #65