Desperate fix for #80