diff --git a/src/servers/app/ServerBitmap.cpp b/src/servers/app/ServerBitmap.cpp
index 8bb6bdbb4d..cf84ff0943 100644
--- a/src/servers/app/ServerBitmap.cpp
+++ b/src/servers/app/ServerBitmap.cpp
@@ -87,6 +87,8 @@ ServerBitmap::ServerBitmap(const ServerBitmap* bmp)
 */
 ServerBitmap::~ServerBitmap()
 {
+	// TODO: Maybe it would be wiser to free the buffer here,
+	// instead of do that in every subclass ?
 }
 
 /*! 
@@ -100,7 +102,7 @@ ServerBitmap::_AllocateBuffer(void)
 {
 	uint32 length = BitsLength();
 	if (length > 0) {
-		delete fBuffer;
+		delete[] fBuffer;
 		fBuffer = new uint8[length];
 	}
 }
@@ -113,7 +115,7 @@ ServerBitmap::_AllocateBuffer(void)
 void
 ServerBitmap::_FreeBuffer(void)
 {
-	delete fBuffer;
+	delete[] fBuffer;
 	fBuffer = NULL;
 }