Fixed ! that i have forget on 2 functions

fixed if