Fix Issue #27