Fixes #198
Fixes failing tests
Merge pull request #200 from scala/fix-198

Fixes #198