fixing core#6765