Fix Issue #58