add support for legacy comments