Bug Fix: Closes issue #7