Should fix Issue #127