call fix + 2 bugs fix