BUG Fix incompatibility with framework 3.2

If this fix is approved please create a 0.5 branch off the current master, and mark the composer.json as ~3.1.0 prior to merging please.