8867 fix