Fixed: End Of Names fixed