hot fix in DesktopClient