Realized we're using 0-7, and not 1-8

Might exist some logic issues that I didn't catch.