Possibly fix 304 issues as reported by milkytiptoe. #932