Fix GPPLATFORMCORE-55

Fix https://jira.grails.org/browse/GPPLATFORMCORE-55