attempt to fix issue #7