Fix None-Name Bug