Fixing scale bug