Minor optimization

2 jobs for master in 8 minutes and 38 seconds (queued for 60 minutes and 58 seconds)