[54] Disabling comments now more correctly