fixes #3142
Merge pull request #3143 from dotCMS/issue-2933-to-2.5

fixes #3142