Implemented (Fix?) Issue #5