nice hack, but let's remove it from the patch :)