Fix #522 part  1
Merge pull request #524 from aesedepece/dev

Fix #522 part  1