addition to fix issue #3