Yes, just like said above, this code was broken all way long =) See comment above =)