Fix for PAAS-74