Fix for Travis CI-12