1) BugFix for Client side.