Fix getting single digit issues