Fix flexible fix for #431