Task:     Reported on irc
Details:  Hopefully this new code is a little bit more robust, i tried
to untangle the code a bit.