Fixed Issue #126 and #127