null value fix - issue #1