diff --git a/library/server/wsf_html/form/wsf_form_selectable_input.e b/library/server/wsf_html/form/wsf_form_selectable_input.e
index 37c58366..7fff2b57 100644
--- a/library/server/wsf_html/form/wsf_form_selectable_input.e
+++ b/library/server/wsf_html/form/wsf_form_selectable_input.e
@@ -72,12 +72,22 @@ feature -- Change
set_value (v: detachable WSF_VALUE)
-- Set value `v' if applicable to Current
+ local
+ l_found: BOOLEAN
do
if attached {ITERABLE [WSF_VALUE]} v as lst then
across
lst as c
+ until
+ l_found
loop
- set_checked_by_value (c.item)
+ if attached {WSF_STRING} c.item as s and then is_same_value (s.value) then
+ set_checked_by_value (c.item)
+ l_found := true
+ end
+ end
+ if not l_found then
+ set_checked (False)
end
else
set_checked_by_value (v)