Fixing PAAS-158