Change comments to match current behavior