Fix Issue #61