Fix #488
Merge pull request #489 from pwaller/issue-488

Fix #488