Include scale in margin calculation

Fixes broken spec