BUG Fix incompatibility with framework 3.2