fix for tray
rebase fix for windows