GRAILS-10077 fix