fix for GRAILS-10470