an attempt to fix issue #111