Fix Issue #231