second pass of #111