BUGFIX in  GUI TOOLS