Bug fix in Front End Controller