seems to fix issue #5