Scaling fix 3