New patch to hopefully fix last failures.