attempt to fix issue #6