Should solve TravisCI build issues