Issue #8 uncomment