Fix for GRAILS-10403