bug fix + fix JL feedbacks