Threading fix #3