Fix for Travis CI-19