Copied travis fix from Tutor