Fixed control bug