Allowing Rimu to work.
Merge fix.