undid issue #8