Fix #917