Patch by Cedric Cocquebert to improve the panoramix module.