resolve 56888 in #13