Fix 1.8 EXP Bug