[Comments]: bug fixed & improvement