bug fix & log comment out