Double Builds, still annoying the shit out of me.

[vunchas]

I'm trying to fix them myself i'll make a pull request if i manage to do so.