Fix bug with enabling/disabling comments introduced in previous commit