This should fix this, but breaks 3 tests. I'll postpone this for now.. we have more critical tickets and we're close to a release.
