WC-337 #comment fixed