Holy crap, that IS pretty clever!

I was going to say simply add 1 to the result if it is 7. That makes 8 have a slightly higher chance of being the number, but probably not too bad.