Fix #92
Merge pull request #94 from hulu/fix-92

Fix #92