Fixing PAAS-162