#917 – that bastard client