Fixing PAAS-90