Readded scaleToFit option