diff --git a/x11vnc.c b/x11vnc.c
index 3ff868f..894402c 100644
--- a/x11vnc.c
+++ b/x11vnc.c
@@ -170,17 +170,20 @@ int main(int argc,char** argv)
   screen->rfbServerFormat.trueColour = TRUE;
 
   if ( screen->rfbServerFormat.bitsPerPixel == 8 ) {
-     if(CellsOfScreen(ScreenOfDisplay(dpy,xscreen))!=0) {
+     if(CellsOfScreen(ScreenOfDisplay(dpy,xscreen))) {
 	XColor color[256];
 	int i;
+        screen->colourMap.count = 256;
 	screen->rfbServerFormat.trueColour = FALSE;
 	screen->colourMap.is16 = TRUE;
-	screen->colourMap.count = XQueryColors(dpy,DefaultColormap(dpy,xscreen),color,16);
+        for(i=0;i<256;i++)
+	  color[i].pixel=i;
+	XQueryColors(dpy,DefaultColormap(dpy,xscreen),color,256);
 	screen->colourMap.data.shorts = (short*)malloc(3*sizeof(short)*screen->colourMap.count);
 	for(i=0;i<screen->colourMap.count;i++) {
-	   screen->colourMap.data.shorts[i*6+0] = color[i].red;
-	   screen->colourMap.data.shorts[i*6+2] = color[i].green;
-	   screen->colourMap.data.shorts[i*6+4] = color[i].blue;
+	   screen->colourMap.data.shorts[i*3+0] = color[i].red;
+	   screen->colourMap.data.shorts[i*3+1] = color[i].green;
+	   screen->colourMap.data.shorts[i*3+2] = color[i].blue;
 	}
      } else {
 	screen->rfbServerFormat.redShift = 0;