Make to a version that uses open access client for determining desktop
names