This commit solves #6 issue. All tests still passing.