Fixed scaling again