Fix #888