Fix auto-fill for comments