--- GraphicContext.cpp.dist	2009-10-16 22:23:40.000000000 -0700
+++ GraphicContext.cpp	2009-10-16 22:23:53.000000000 -0700
@@ -63,13 +63,12 @@
 	// Color
 	Uint32 Color::pack() const
 	{
-		return (SDL_MapRGB(&_glFormat, r, g, b) & 0x00ffffff) | (a << 24);
+		return SDL_MapRGBA(&_glFormat, r, g, b, a);
 	}
 	
 	void  Color::unpack(const Uint32 packedValue)
 	{
-		SDL_GetRGB(packedValue, &_glFormat, &r, &g, &b);
-		a = packedValue >> 24;
+		SDL_GetRGBA(packedValue, &_glFormat, &r, &g, &b, &a);
 	}
 	
 	void Color::getHSV(float *hue, float *sat, float *lum)