Fix 0.8