bug fix - issue #6