Integrate bugfix.