As we discussed it: let's extract the hack :P