merged kaneshin - Fix scale size