#7627 Fix bug discussed
Merge pull request #10 from vatseek/7627

#7627 Fix bug discussed