Fixing #808 bugs
Merge pull request #953 from PirataNervo/feature-808

Fixing #808 bugs