Fix for 0.8 to make travis correctly terminate