fix issue with null name