Fixed control unit bug