Fixing JSON issue