Fix Issue #42