Controller bug fix