Fix #865