System Control bug fix