Fix for checkboxes and nested tables