Partial fix for check box selection issue.