trying to fix john's recently introduced thread-unsafe bugs