Value handling for #1095