null fix needed elsewhere