Fix classname bug for 1.8.4 from Touchten