Fix for Travis CI-6