Agent viewer fixed