this tries to fix issue #1