first attempt to fix issue #41