GRAILS-10275 fix