Second fix for 0.8.6