Issue #126 Fixed