Issue #174 - Fix and Modify