Fixed Post upgrade 3.40 issue