possible GRAILS-7471 improvement (clutching at straws now)