now works in non-client mode again