fixes #5600 in master 3.0
Merge pull request #5635 from dotCMS/merge-5600-to-master-3-0

fixes #5600 in master 3.0