Added bound check for draw