DROOLS-91 + DROOLS-99 **Tentative** fix

Please review and discuss