Merge fix.

Because merging is tough, man.