updated to fix issue #31