fixing PPAAS-19