fix for null