More on #155 and #111