Second attempt to fix for Travis CI