Workaround for strange comments API