applied patch from newboo to guihandler