#159 Check workers earlier