bug fix & kfs develop