Thread interface fix