Fix for Travis CI-16