Still trying to fix random travis failures