Fix for PAAS-123