fixed bug handling falsey non-null values