Merge "Fix bug found by fuzzer."