Important bugfix for client and server escalation fixes #30 and #29