This is fixed on the other thread