Fix Issue #257