fix variable names binding