already merged in #725