GRAILS-10561

Fix for GRAILS-10561: http://jira.grails.org/browse/GRAILS-10561