GRAILS-6650 fixed now