Fix Issue #152.