Fixes #242
Merge pull request #244 from breach/fix242

Review: Fix #242