merge CW-copy to CW-master buggfix