Fix #864