Bug fix in Client. Headers added to all source