Fix a bug and make travis happy