Fix for Travis CI-15