Proper fix for ST2 threading problems (Issue #14)