Comment null adaptation