Serious bug fix with Controller