Added check for straight