redid issue #30 fix