UPDATED: Added fix for dummy threading issues

This fix is intended to be temporary