sidestep issue 10928
Merge pull request #1535 from blackwhale/fix-lambda

Sidestep issue 10928