Minor optimization

2 jobs for master in 7 minutes and 42 seconds (queued for 4 minutes)