- Fix issue with name been shown multiple times