Better bug fix