fixed issue with null value as value