Toggle fix