Case-fix part 2