Address issue #127