Fix #568 for real.
Merge pull request #682 from godarklight/fix-568

Fix #568 for real.