Issue #2 fully fixed

sweet