And the reamining part of the bugfix.