fix for null value