Fixes #989
Merge pull request #1002 from mdogan/fix/3.2/989

Fixes #989