Improved straight draw check