separately scalable bug fix