fixes #48
Merge pull request #49 from dotCMS/issue-48-backport-6754

fixes #48