Travis fix by #1986686