fix remainder of #127