patch to address #111