working on bug fix