CEWO-3 fix this bug