controller assignment bug fix