Issue #174 - Fix implementation