diff --git a/src/nvtt/Context.cpp b/src/nvtt/Context.cpp
index a049ddf..cd23dd8 100644
--- a/src/nvtt/Context.cpp
+++ b/src/nvtt/Context.cpp
@@ -268,6 +268,9 @@ bool Compressor::Private::compress(const InputOptions::Private & inputOptions, c
         if (!img.isNormalMap()) {
             img.toLinear(inputOptions.inputGamma);
         }
+        else {
+            img.expandNormals();
+        }
 
         // Resize input.
         img.resize(w, h, d, ResizeFilter_Box);
@@ -276,6 +279,9 @@ bool Compressor::Private::compress(const InputOptions::Private & inputOptions, c
         if (!img.isNormalMap()) {
             tmp.toGamma(inputOptions.outputGamma);
         }
+        else {
+            tmp.packNormals();
+        }
 
         quantize(tmp, compressionOptions);
         compress(tmp, f, 0, compressionOptions, outputOptions);
@@ -304,6 +310,9 @@ bool Compressor::Private::compress(const InputOptions::Private & inputOptions, c
                 if (!img.isNormalMap()) {
                     img.toLinear(inputOptions.inputGamma);
                 }
+                else {
+                    img.expandNormals();
+                }
             }
             else {
                 if (inputOptions.mipmapFilter == MipmapFilter_Kaiser) {
@@ -323,6 +332,7 @@ bool Compressor::Private::compress(const InputOptions::Private & inputOptions, c
                     img.normalizeNormalMap();
                 }
                 tmp = img;
+                tmp.packNormals();
             }
             else {
                 tmp = img;