another attempt to fix issue #19