Fix missing method from last commit, the merge was very complicated and it seem that I am not merge correct. Now everything is FIX .