Improvement for GRAILS-9912 fix