Still working on fix for Travis