Another attempt to fix 0.8.