Updated with v3.2.2 Bugfixes