Fix for Travis CI-7