Added a better workaround for Travis CI.