workaround for GRAILS-10954 and GRAILS-10425 implemented
removed unnecessary comments