Fixing for null values