Corrected code comment.
Confirmed issue #2 by creating a test case.
Resolved #2.