Fix for 0.8