case fix part 1
case fix part 2