Attempt to fix issue #72