CW-47 - fix.