Added workaround for checkbox with values