Scaling fix 2