Hopefully final fix for travis.ci