Critical bug fix in general contoller