Second cut of RM#18, sporadic threads. Fixes #223