changes relevant to #127