Fix edge case of non-celeb