diff --git a/uppsrc/Draw/Draw.cpp b/uppsrc/Draw/Draw.cpp
index a3feee101..d03f1efee 100644
--- a/uppsrc/Draw/Draw.cpp
+++ b/uppsrc/Draw/Draw.cpp
@@ -238,7 +238,7 @@ void Draw::DrawImage(int x, int y, const Image& img, const Rect& src, Color colo
 {
 	if(IsNull(color)) return;
 	Size sz = img.GetSize();
-	DrawImageOp(x, y, sz.cx, sz.cy, img, src, color);
+	DrawImageOp(x, y, src.Width(), src.Height(), img, src, color);
 }
 
 void Draw::DrawImage(int x, int y, const Image& img, Color color)
diff --git a/uppsrc/Draw/MakeCache.cpp b/uppsrc/Draw/MakeCache.cpp
index 217b9b232..9744c323f 100644
--- a/uppsrc/Draw/MakeCache.cpp
+++ b/uppsrc/Draw/MakeCache.cpp
@@ -192,7 +192,6 @@ struct sCachedRescale : public ImageMaker
 	virtual Image Make() const {
 		return IsNull(filter) ? Rescale(img, sz, src) : RescaleFilter(img, sz, src, filter);
 	}
-
 };
 
 Image CachedRescale(const Image& m, Size sz, const Rect& src, int filter)