Another Thread Safety tweak...