another fix for yelo, not sure why we got this nullpointer