Github/108

Seems to fix the problem.

As said in the commit log,  I took the liberty to make a similar change en bzr part, just a precaution.