2 1 thread safety

Per https://groups.google.com/forum/#!msg/refinery-cms/L9Im-h8MJmE/Oi0aaj725ggJ