lets' merge some threads

This is a bug from the last update