Corrects Issue #1