Fix Issue #53