case fix part one
case fix part two