Revert "Revert "!smoke stuff""

This reverts commit 7bb2f95f5619d14c983d506179b43da16168cc5b.
zero length fix