CW-254 fixed problem