LPS 42141

Contributed solution to: https://issues.liferay.com/browse/LPS-42141