AUI-1545

Ticket: [AUI-1545](https://issues.liferay.com/browse/AUI-1545)

The problem found in jonmak08#168 should be resolved.