AAD-79: deployment fix