Fixed: End Of Names really fixed