better bug fix