LPS-43627

Fix #2 for https://github.com/hhuijser/liferay-portal/pull/1678