Fix Issue #46