Fix Issue #56