fixed issue #8, again