fix for GRAILS-10454