[PENDING: update the comments] bug