Do not spawn unecessary threads, refs #228