F Fix functions name
F Fix wrong condition when merge PR#1