Fixing PAAS-155