updates to fix issue #8