fix up issue #26