some fix in front-controller