Merge TOFU fix