and here comes the patch :-)