Fix for failing Travis-CI tests