Fix Issue #805
Merge pull request #807 from twosigma/spot/805

Fix Issue #805