Correction of some bugs on the control way