fixes issue #528
version 3.2.1
Merge branch 'hotfixes' into stable