Fix Issue #9, with comment.