Fixing Client jawn