fix for null var