Bug fix for FOP2 module