Fix #127/#130