Fix #608 again.
Merge pull request #636 from jmaas/master

Fix #608 again.