Fixed scaling. Tested