Address Issue #5
Attempt to fix Issue #4