Attempting to address issue #1