Control bug fix