Fix done and Travis fixed