Fixed MOC thread safety