WIP: BUG-5464: scaling issue