redo logic to avoid Travis failures