fix version with bdd + cleaning