Add incremental fix for #3540