Issue #121 - Fix code
Issue #121 - Fix code