Fixes #272
Merge pull request #347 from rackerlabs/fixes_for_272

Fixes #272