fix multiple traces related issues