Fix Issue #47