Improve robustness of dependance solution