[BugFix]: Travis Issues round 2