#23 works fine for me. Thanks for this great patch. Hope this functionnality will be add un future release of Drupal....