attempts to fix issue #19