Made toggle comment more robust.