Fixed bug when code hit 8