Fixes #662
Merge pull request #663 from ATofighi/patch-21

Fixes #662