modular-scale bug fix