Toggle method fix