Comment parsing fix