[BUGFIX] Bad function callings