small modification for more reliable driver (a bit slower though)