I agree, that is also the solution I suggested. I will try to bring this back for C2y.