trying to fix issue #5