Class C bug fix