bug fix & comment