bug fix ~~