Fix Issue #49