Correction of Issue #27