Fixes #656
Merge pull request #657 from ATofighi/patch-20

Fixes #656