Resolve Incorrect Outputs:

[Mmabiaa]

Fix logic errors that produce incorrect results in specific scenarios.

[DouglasAKJ]

hi! i would like to work in this issue, but as the project is a bit old i dont know if you are still accepting PRs hehe