diff --git a/videodev-vfw.cc b/videodev-vfw.cc
index c3f4ff9..5ff7665 100644
--- a/videodev-vfw.cc
+++ b/videodev-vfw.cc
@@ -249,7 +249,6 @@ int VideoDev_VFW::CaptureStart() {
 	  return VDEV_STATUS_ERROR;
 	}
 
-#if 0
 	if(!capSetCallbackOnVideoStream(cap, VFW_frame_callback)) {
 	  printf ("%s:%d %s Could not set videostream callback to VFW id %d\n", __FILE__, __LINE__, __FUNCTION__, camid);
 	  return VDEV_STATUS_ERROR;
@@ -259,7 +258,6 @@ int VideoDev_VFW::CaptureStart() {
 	  printf ("%s:%d %s Cmould not set yield callback to VFW id %d\n", __FILE__, __LINE__, __FUNCTION__, camid);
 	  return VDEV_STATUS_ERROR;
 	}
-#endif
 	
 	if(!capSetCallbackOnFrame(cap, VFW_frame_callback)) {
 	  printf ("%s:%d %s Could not set frame callback to VFW id %d\n", __FILE__, __LINE__, __FUNCTION__, camid);
@@ -302,7 +300,7 @@ int VideoDev_VFW::CaptureStop() {
 int VideoDev_VFW::Grab(VideoFrameRaw *vf) {
 
 	MSG msg;
-	if(PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
+	while(PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
 	  TranslateMessage(&msg);
 	  DispatchMessage(&msg);
 	}