BugFix #821

Extended client session