Issue with CASE C/T handing