Fix #16 again

8 jobs for master in 13 minutes and 37 seconds (queued for 1 second)