Fix issue #398, and cleanup typo.