Workaround GRAILS-11670