Wow...great to see that you debugged this. It would be great if this were a proper package though, as this method is a bit of a pain.

Do you have your fixed code somewhere?