Adressing issue #3