Cleaning tore code. Still the same bug.