Fix: issue #509
Merge pull request #527 from nizar-sallem/fix

Fix: issue #509