v3.2 Bugs fixed