Fixing response fields