Part 5.7: First attempt to make travis happy