Tried to recreate things.
Finally working and tested.  *blush*