(#1215) - make totally worker safe, with tests