attempt to fix issue #57