diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp
index 97f393cb2..234d447c4 100644
--- a/src/textures/texture.cpp
+++ b/src/textures/texture.cpp
@@ -549,8 +549,8 @@ FTexture *FTexture::GetRedirect(bool wantwarped)
 
 void FTexture::SetScaledSize(int fitwidth, int fitheight)
 {
-	xScale = DivScale16(Width, fitwidth);
-	yScale = DivScale16(Height,fitheight);
+	xScale = FLOAT2FIXED(float(Width) / fitwidth);
+	yScale = FLOAT2FIXED(float(Height) / fitheight);
 	// compensate for roundoff errors
 	if (MulScale16(xScale, fitwidth) != Width) xScale++;
 	if (MulScale16(yScale, fitheight) != Height) yScale++;
diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp
index 34e2f4ae6..e562923db 100644
--- a/src/textures/texturemanager.cpp
+++ b/src/textures/texturemanager.cpp
@@ -822,10 +822,13 @@ void FTextureManager::AddTexturesForWad(int wadnum)
 		}
 	}
 
-	// Seventh step: Check for hires replacements.
-	AddHiresTextures(wadnum);
+	// Check for text based texture definitions
 	LoadTextureDefs(wadnum, "TEXTURES");
 	LoadTextureDefs(wadnum, "HIRESTEX");
+
+	// Seventh step: Check for hires replacements.
+	AddHiresTextures(wadnum);
+
 	SortTexturesByType(firsttexture, Textures.Size());
 }