another null fix