bug fix … but not finish