Applied a fix to let us better handle check boxes.