fixed GRAILS-9804