Fix Issue #25