bug fix, hopefully