applied fix for GRAILS-10232