Issue #174 - Modify and fix