trying to fix issue #1 and issue #2