PAAS bugfix