Merged in bugfix from 3.2.1