Fix #229
Merge pull request #230 from scala/issue-229

Fix #229