Fix Issue #57