attempt to fix issue #2