updated to fix issue #44