Changes for #433