less interference with scaling
Merge pull request #19 from willtp87/7.x

less interference with scaling