fix second part of #111