Fix #577 for Polish
Fix #577 for other languages
Merge pull request #580 from makson96/Bug577

fixes #577