Right, missed that little thing. But IMO this __must__ be refactored into something that is readeable, right now this thing (the `return` "iffing") is ugly "crap" =)