Fixed issue with threads restarting each call