Merge pull request #3710 from naglis/izlesene_fix