Fixed Issue #4 (yet again)