Issue #7 tried to fix.