Previous fix didn't work, hoped this one did. Cleaning up threads