solves issue PF140708 for branch 4.1
Merge pull request #419 from igal-getrailo/PF140708-41b

solves issue PF140708 for branch 4.1