Patched to work with latest Wdb library