Fix Issue #140.
Give a test for Issue #140.