first attempt at 180 bug fix