adressing issue #1