Fix Issue #55