Small update of the counter-strategy code. Should correct some corner-cases