Fix for PAAS-75