threads merged, let's see if there is any fix