Fixing for 0.8