Fix #910