Scaling bug fixed