Possible fix for nullref #336