now works when client behaves strangely