Fix comment api