staff new bug fix :(