Fix scaling finally