Toggle binding fix