attempted to address issue #7