Fix for comment triggering