Fix 200 / 304 issue