Might have fixed nullref