Fixed setup on desktop system