Fix for 1.08b