Fix issues with rescale