adressing issue #6 - it is dirty but effictive