Fix Issue #255