Update with bug fix and thread troubleshooting