bug fix helpers