fix for null vals