Fix issue with scale