Fixed #4694
Merge pull request #139 from JustRamires/master

Ticket #4694