fixing issue in PAAS-68