Systray patch - resolved conflict